From 78723eac3c98408263658da271eff34c518a31e4 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann Date: Fri, 3 Dec 2021 11:17:46 +0100 Subject: [PATCH] [PATCH 80/90] rename get_llvm_cpu_name() to pocl_get_llvm_cpu_name() Gbp-Pq: Name 0080-rename-get_llvm_cpu_name-to-pocl_get_llvm_cpu_name.patch --- lib/CL/devices/basic/basic.c | 2 +- lib/CL/devices/common.c | 2 +- lib/CL/devices/hsa/pocl-hsa.c | 2 +- lib/CL/devices/pthread/pthread.c | 2 +- lib/CL/pocl_llvm.h | 2 +- lib/CL/pocl_llvm_utils.cc | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/CL/devices/basic/basic.c b/lib/CL/devices/basic/basic.c index 939282d..3ff95df 100644 --- a/lib/CL/devices/basic/basic.c +++ b/lib/CL/devices/basic/basic.c @@ -144,7 +144,7 @@ pocl_basic_build_hash (cl_device_id device) { char* res = calloc(1000, sizeof(char)); #ifdef KERNELLIB_HOST_DISTRO_VARIANTS - char *name = get_llvm_cpu_name (); + char *name = pocl_get_llvm_cpu_name (); snprintf (res, 1000, "basic-%s-%s", HOST_DEVICE_BUILD_HASH, name); POCL_MEM_FREE (name); #else diff --git a/lib/CL/devices/common.c b/lib/CL/devices/common.c index 4c49a5e..62c4500 100644 --- a/lib/CL/devices/common.c +++ b/lib/CL/devices/common.c @@ -1512,7 +1512,7 @@ pocl_init_default_device_infos (cl_device_id dev) #ifdef HOST_CPU_FORCED dev->llvm_cpu = OCL_KERNEL_TARGET_CPU; #else - dev->llvm_cpu = get_llvm_cpu_name (); + dev->llvm_cpu = pocl_get_llvm_cpu_name (); #endif dev->spirv_version = "SPIR-V_1.2"; diff --git a/lib/CL/devices/hsa/pocl-hsa.c b/lib/CL/devices/hsa/pocl-hsa.c index 6648144..92dc4dc 100644 --- a/lib/CL/devices/hsa/pocl-hsa.c +++ b/lib/CL/devices/hsa/pocl-hsa.c @@ -485,7 +485,7 @@ get_hsa_device_features(char* dev_name, struct _cl_device_id* dev) /* TODO: Add a CMake variable or HSA description string autodetection to control these. */ if (dev->llvm_cpu == NULL) - dev->llvm_cpu = get_llvm_cpu_name (); + dev->llvm_cpu = pocl_get_llvm_cpu_name (); if (dev->llvm_target_triplet == NULL) dev->llvm_target_triplet = OCL_KERNEL_TARGET; dev->arg_buffer_launcher = CL_TRUE; diff --git a/lib/CL/devices/pthread/pthread.c b/lib/CL/devices/pthread/pthread.c index e66d76e..c73bfa1 100644 --- a/lib/CL/devices/pthread/pthread.c +++ b/lib/CL/devices/pthread/pthread.c @@ -102,7 +102,7 @@ pocl_pthread_build_hash (cl_device_id device) { char* res = calloc(1000, sizeof(char)); #ifdef KERNELLIB_HOST_DISTRO_VARIANTS - char *name = get_llvm_cpu_name (); + char *name = pocl_get_llvm_cpu_name (); snprintf (res, 1000, "pthread-%s-%s", HOST_DEVICE_BUILD_HASH, name); POCL_MEM_FREE (name); #else diff --git a/lib/CL/pocl_llvm.h b/lib/CL/pocl_llvm.h index 60f48d2..bf32ab2 100644 --- a/lib/CL/pocl_llvm.h +++ b/lib/CL/pocl_llvm.h @@ -36,7 +36,7 @@ extern "C" { /* Returns the cpu name as reported by LLVM. */ POCL_EXPORT - char *get_llvm_cpu_name (); + char *pocl_get_llvm_cpu_name (); /* Returns if the cpu supports FMA instruction (uses LLVM). */ int cpu_has_fma (); diff --git a/lib/CL/pocl_llvm_utils.cc b/lib/CL/pocl_llvm_utils.cc index 2d4fc0d..675094d 100644 --- a/lib/CL/pocl_llvm_utils.cc +++ b/lib/CL/pocl_llvm_utils.cc @@ -122,8 +122,7 @@ static int getModuleTriple(const char *input_stream, size_t size, return 0; } -char * -get_llvm_cpu_name () { +char *pocl_get_llvm_cpu_name() { StringRef r = llvm::sys::getHostCPUName(); // LLVM may return an empty string -- treat as generic -- 2.30.2